From 927990e15fd7d9968c2d378216bf79bed644c88b Mon Sep 17 00:00:00 2001 From: robertlipe Date: Mon, 8 Dec 2014 18:35:31 +0000 Subject: [PATCH] Continue repair of #includes. We use a lot more std c than I thought/hoped. :-( Tested: Centos. --- gpsbabel/alan.cc | 1 + gpsbabel/an1.cc | 1 + gpsbabel/brauniger_iq.cc | 1 + gpsbabel/cst.cc | 2 ++ gpsbabel/delbin.cc | 1 + gpsbabel/dg-100.cc | 3 ++- gpsbabel/easygps.cc | 1 + gpsbabel/enigma.cc | 2 +- gpsbabel/exif.cc | 3 ++- gpsbabel/garmin.cc | 1 + gpsbabel/garmin_device_xml.cc | 3 ++- gpsbabel/garmin_fit.cc | 1 + gpsbabel/garmin_gpi.cc | 1 + gpsbabel/garmin_xt.cc | 1 + gpsbabel/gdb.cc | 1 + gpsbabel/ggv_log.cc | 1 + gpsbabel/gpsutil.cc | 2 ++ gpsbabel/gtrnctr.cc | 1 + gpsbabel/hiketech.cc | 7 +++---- gpsbabel/holux.cc | 3 +++ gpsbabel/humminbird.cc | 1 + gpsbabel/igc.cc | 2 ++ gpsbabel/ignrando.cc | 1 + gpsbabel/igo8.cc | 1 + gpsbabel/jeeps/gpscom.cc | 3 ++- gpsbabel/jtr.cc | 1 + gpsbabel/lmx.cc | 1 + gpsbabel/lowranceusr4.cc | 1 + gpsbabel/mapsend.cc | 1 + gpsbabel/mapsource.cc | 2 ++ gpsbabel/mmo.cc | 3 +++ gpsbabel/mtk_logger.cc | 1 + gpsbabel/osm.cc | 3 ++- gpsbabel/parse.cc | 1 + gpsbabel/random.cc | 1 + gpsbabel/rgbcolors.cc | 1 + gpsbabel/shape.cc | 1 + gpsbabel/skytraq.cc | 2 ++ gpsbabel/stmsdf.cc | 1 + gpsbabel/tiger.cc | 2 ++ gpsbabel/tomtom.cc | 1 + gpsbabel/tpo.cc | 3 +++ gpsbabel/v900.cc | 3 ++- gpsbabel/vcf.cc | 7 +++---- gpsbabel/vidaone.cc | 1 + gpsbabel/wbt-200.cc | 2 ++ gpsbabel/wfff_xml.cc | 1 + gpsbabel/xcsv.cc | 3 ++- 48 files changed, 72 insertions(+), 16 deletions(-) diff --git a/gpsbabel/alan.cc b/gpsbabel/alan.cc index 1178ce221..40d539da7 100644 --- a/gpsbabel/alan.cc +++ b/gpsbabel/alan.cc @@ -25,6 +25,7 @@ */ #include "defs.h" +#include #define MYNAME "alan" diff --git a/gpsbabel/an1.cc b/gpsbabel/an1.cc index 90c848a7a..9edd025d0 100644 --- a/gpsbabel/an1.cc +++ b/gpsbabel/an1.cc @@ -21,6 +21,7 @@ #include "defs.h" #include // atof +#include // sprintf #define MYNAME "an1" diff --git a/gpsbabel/brauniger_iq.cc b/gpsbabel/brauniger_iq.cc index 35b65c0b9..c2eecac1f 100644 --- a/gpsbabel/brauniger_iq.cc +++ b/gpsbabel/brauniger_iq.cc @@ -20,6 +20,7 @@ #include "defs.h" #include "gbser.h" +#include static void* serial_handle; diff --git a/gpsbabel/cst.cc b/gpsbabel/cst.cc index f4b5ea6b9..dbcddde4e 100644 --- a/gpsbabel/cst.cc +++ b/gpsbabel/cst.cc @@ -22,6 +22,8 @@ #include "defs.h" #include "strptime.h" +#include +#include #define MYNAME "cst" diff --git a/gpsbabel/delbin.cc b/gpsbabel/delbin.cc index a08c44100..73c23791e 100644 --- a/gpsbabel/delbin.cc +++ b/gpsbabel/delbin.cc @@ -24,6 +24,7 @@ #include "src/core/xmltag.h" #include #include /* for atoi, sprintf */ +#include // atoi #define MYNAME "delbin" static short_handle mkshort_handle; diff --git a/gpsbabel/dg-100.cc b/gpsbabel/dg-100.cc index 6d00bcad9..e612e0cc7 100644 --- a/gpsbabel/dg-100.cc +++ b/gpsbabel/dg-100.cc @@ -33,7 +33,8 @@ #include "gbser.h" #include -#include +#include +#include #define MYNAME "DG-100" diff --git a/gpsbabel/easygps.cc b/gpsbabel/easygps.cc index 686412c25..79f1c7ed5 100644 --- a/gpsbabel/easygps.cc +++ b/gpsbabel/easygps.cc @@ -20,6 +20,7 @@ #include "defs.h" +#include static gbfile* file_in; static gbfile* file_out; diff --git a/gpsbabel/enigma.cc b/gpsbabel/enigma.cc index 872ac3c7d..1be9e389b 100644 --- a/gpsbabel/enigma.cc +++ b/gpsbabel/enigma.cc @@ -23,7 +23,7 @@ #include "defs.h" #include -#include +#include #define MYNAME "Enigma binary route and waypoint file format" diff --git a/gpsbabel/exif.cc b/gpsbabel/exif.cc index 53ce84282..8325d2b5c 100644 --- a/gpsbabel/exif.cc +++ b/gpsbabel/exif.cc @@ -31,7 +31,8 @@ #include "defs.h" #include "garmin_tables.h" #include "jeeps/gpsmath.h" - +#include +#include #include #define MYNAME "exif" diff --git a/gpsbabel/garmin.cc b/gpsbabel/garmin.cc index bce743319..b18195c93 100644 --- a/gpsbabel/garmin.cc +++ b/gpsbabel/garmin.cc @@ -21,6 +21,7 @@ #include #include +#include #include #include "defs.h" diff --git a/gpsbabel/garmin_device_xml.cc b/gpsbabel/garmin_device_xml.cc index 4aedab33c..ae4bcb6fd 100644 --- a/gpsbabel/garmin_device_xml.cc +++ b/gpsbabel/garmin_device_xml.cc @@ -24,11 +24,12 @@ // http://developer.garmin.com/web-device/garmin-mass-storage-mode-devices/ // http://developer.garmin.com/schemas/device/v2/ -#include #include "defs.h" #include "xmlgeneric.h" #include "garmin_device_xml.h" +#include +#include #define MYNAME "whatever" diff --git a/gpsbabel/garmin_fit.cc b/gpsbabel/garmin_fit.cc index 6047ebf0e..82fe6b756 100644 --- a/gpsbabel/garmin_fit.cc +++ b/gpsbabel/garmin_fit.cc @@ -22,6 +22,7 @@ */ #include "defs.h" +#include #define MYNAME "fit" diff --git a/gpsbabel/garmin_gpi.cc b/gpsbabel/garmin_gpi.cc index 08b8c95d7..17e18f799 100644 --- a/gpsbabel/garmin_gpi.cc +++ b/gpsbabel/garmin_gpi.cc @@ -49,6 +49,7 @@ #include "jeeps/gpsmath.h" #include "garmin_fs.h" #include "garmin_gpi.h" +#include #include #define MYNAME "garmin_gpi" diff --git a/gpsbabel/garmin_xt.cc b/gpsbabel/garmin_xt.cc index 12ada95bc..037708618 100644 --- a/gpsbabel/garmin_xt.cc +++ b/gpsbabel/garmin_xt.cc @@ -24,6 +24,7 @@ */ #include "defs.h" +#include #define MYNAME "Garmin_XT" #define GARMIN_XT_ELE 31500/65536 diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc index cac6b0fef..35bd0780b 100644 --- a/gpsbabel/gdb.cc +++ b/gpsbabel/gdb.cc @@ -30,6 +30,7 @@ #include "grtcirc.h" #include "jeeps/gpsmath.h" #include +#include #define MYNAME "gdb" diff --git a/gpsbabel/ggv_log.cc b/gpsbabel/ggv_log.cc index ab4f45d64..0db3867fe 100644 --- a/gpsbabel/ggv_log.cc +++ b/gpsbabel/ggv_log.cc @@ -22,6 +22,7 @@ #include #include +#include #include #include "defs.h" diff --git a/gpsbabel/gpsutil.cc b/gpsbabel/gpsutil.cc index 245a3b3ee..c7768e9d8 100644 --- a/gpsbabel/gpsutil.cc +++ b/gpsbabel/gpsutil.cc @@ -23,6 +23,8 @@ #include "defs.h" #include "magellan.h" #include +#include +#include static gbfile* file_in, *file_out; static short_handle mkshort_handle; diff --git a/gpsbabel/gtrnctr.cc b/gpsbabel/gtrnctr.cc index 47c4311e3..4ee09e229 100644 --- a/gpsbabel/gtrnctr.cc +++ b/gpsbabel/gtrnctr.cc @@ -28,6 +28,7 @@ #include "defs.h" #include "xmlgeneric.h" +#include static gbfile* ofd; static int lap_ct = 0; diff --git a/gpsbabel/hiketech.cc b/gpsbabel/hiketech.cc index 30c218a47..d710f6f88 100644 --- a/gpsbabel/hiketech.cc +++ b/gpsbabel/hiketech.cc @@ -19,12 +19,11 @@ */ -#include -#include "src/core/xmlstreamwriter.h" - - #include "defs.h" #include "xmlgeneric.h" +#include "src/core/xmlstreamwriter.h" +#include +#include static gbfile* ofd; static QString ostring; diff --git a/gpsbabel/holux.cc b/gpsbabel/holux.cc index 8a91eb196..b17c5c0aa 100644 --- a/gpsbabel/holux.cc +++ b/gpsbabel/holux.cc @@ -27,6 +27,9 @@ History: #include "defs.h" #include "holux.h" +//#include +#include +#include static gbfile* file_in, *file_out; static unsigned char* HxWFile; diff --git a/gpsbabel/humminbird.cc b/gpsbabel/humminbird.cc index a3255f12a..b9380230a 100644 --- a/gpsbabel/humminbird.cc +++ b/gpsbabel/humminbird.cc @@ -21,6 +21,7 @@ #include "defs.h" #include +#include #include #define MYNAME "humminbird" diff --git a/gpsbabel/igc.cc b/gpsbabel/igc.cc index e34a2f3c2..3035ff582 100644 --- a/gpsbabel/igc.cc +++ b/gpsbabel/igc.cc @@ -26,6 +26,8 @@ #include "defs.h" #include #include +#include +#include static gbfile* file_in, *file_out; static char manufacturer[4]; diff --git a/gpsbabel/ignrando.cc b/gpsbabel/ignrando.cc index c113c4c04..d134fb642 100644 --- a/gpsbabel/ignrando.cc +++ b/gpsbabel/ignrando.cc @@ -22,6 +22,7 @@ #include "defs.h" #include "xmlgeneric.h" #include +#include #define MYNAME "IGNRando" diff --git a/gpsbabel/igo8.cc b/gpsbabel/igo8.cc index 16db80f4d..bbc919327 100644 --- a/gpsbabel/igo8.cc +++ b/gpsbabel/igo8.cc @@ -64,6 +64,7 @@ #include "defs.h" #include "cet.h" #include "cet_util.h" +#include #define FLOAT_TO_INT(x) ((int)((x) + ((x)<0?-0.5:0.5))) #define IGO8_HEADER_SIZE (sizeof(igo8_id_block) + 256) diff --git a/gpsbabel/jeeps/gpscom.cc b/gpsbabel/jeeps/gpscom.cc index bcd686df9..0420ed352 100644 --- a/gpsbabel/jeeps/gpscom.cc +++ b/gpsbabel/jeeps/gpscom.cc @@ -25,8 +25,9 @@ ** Boston, MA 02111-1307, USA. ********************************************************************/ #include "gps.h" -#include #include +#include +#include /* @func GPS_Command_Off *********************************************** diff --git a/gpsbabel/jtr.cc b/gpsbabel/jtr.cc index 004026961..9fbcae2bb 100644 --- a/gpsbabel/jtr.cc +++ b/gpsbabel/jtr.cc @@ -21,6 +21,7 @@ */ #include "defs.h" #include "csv_util.h" +#include #include #include #include diff --git a/gpsbabel/lmx.cc b/gpsbabel/lmx.cc index 2ec469ba3..66b07efb0 100644 --- a/gpsbabel/lmx.cc +++ b/gpsbabel/lmx.cc @@ -28,6 +28,7 @@ #include "defs.h" #include "xmlgeneric.h" +#include #include static gbfile* ofd; diff --git a/gpsbabel/lowranceusr4.cc b/gpsbabel/lowranceusr4.cc index e16e00416..a0a5c644a 100644 --- a/gpsbabel/lowranceusr4.cc +++ b/gpsbabel/lowranceusr4.cc @@ -29,6 +29,7 @@ #include /* for lat/lon conversion */ #include /* for gmtime */ #include /* for gmtime */ +#include // atoi /* from waypt.c, we need to iterate over waypoints when extracting routes */ diff --git a/gpsbabel/mapsend.cc b/gpsbabel/mapsend.cc index 093fbd753..a887c99d5 100644 --- a/gpsbabel/mapsend.cc +++ b/gpsbabel/mapsend.cc @@ -23,6 +23,7 @@ #include "magellan.h" #include #include +#include static gbfile* mapsend_file_in; static gbfile* mapsend_file_out; diff --git a/gpsbabel/mapsource.cc b/gpsbabel/mapsource.cc index 5dea1d846..81fe6981b 100644 --- a/gpsbabel/mapsource.cc +++ b/gpsbabel/mapsource.cc @@ -24,6 +24,8 @@ #include "defs.h" #include "garmin_tables.h" #include "jeeps/gpsmath.h" +#include +#include static gbfile* mps_file_in; static gbfile* mps_file_out; diff --git a/gpsbabel/mmo.cc b/gpsbabel/mmo.cc index 9b4111446..32f88ab58 100644 --- a/gpsbabel/mmo.cc +++ b/gpsbabel/mmo.cc @@ -21,6 +21,9 @@ */ #include "defs.h" +#include +#include +#include #include #define MYNAME "mmo" diff --git a/gpsbabel/mtk_logger.cc b/gpsbabel/mtk_logger.cc index f48b3508f..c5941b942 100644 --- a/gpsbabel/mtk_logger.cc +++ b/gpsbabel/mtk_logger.cc @@ -60,6 +60,7 @@ #include #include #include +#include #define MYNAME "mtk_logger" diff --git a/gpsbabel/osm.cc b/gpsbabel/osm.cc index efa6aa1dc..c8699781b 100644 --- a/gpsbabel/osm.cc +++ b/gpsbabel/osm.cc @@ -20,10 +20,11 @@ */ -#include #include "defs.h" #include "xmlgeneric.h" +#include +#include static char* opt_tag, *opt_tagnd, *created_by; diff --git a/gpsbabel/parse.cc b/gpsbabel/parse.cc index 4bfdea50b..9003a9c86 100644 --- a/gpsbabel/parse.cc +++ b/gpsbabel/parse.cc @@ -25,6 +25,7 @@ #include "strptime.h" #include #include +#include //strtod /* * parse_distance: diff --git a/gpsbabel/random.cc b/gpsbabel/random.cc index c17962be6..831d4e484 100644 --- a/gpsbabel/random.cc +++ b/gpsbabel/random.cc @@ -21,6 +21,7 @@ #include "defs.h" #include "garmin_fs.h" #include "jeeps/gpsmath.h" +#include #include #define MYNAME "random" diff --git a/gpsbabel/rgbcolors.cc b/gpsbabel/rgbcolors.cc index 580b0e1b5..68027081a 100644 --- a/gpsbabel/rgbcolors.cc +++ b/gpsbabel/rgbcolors.cc @@ -20,6 +20,7 @@ */ #include "defs.h" +#include /* * Colors derived from http://www.w3.org/TR/SVG/types.html#ColorKeywords diff --git a/gpsbabel/shape.cc b/gpsbabel/shape.cc index b8779f0e8..58157cb50 100644 --- a/gpsbabel/shape.cc +++ b/gpsbabel/shape.cc @@ -21,6 +21,7 @@ */ #include "defs.h" #include "shapelib/shapefil.h" +#include #if SHAPELIB_ENABLED static SHPHandle ihandle; diff --git a/gpsbabel/skytraq.cc b/gpsbabel/skytraq.cc index 0e9194ca7..94dc9ff4d 100644 --- a/gpsbabel/skytraq.cc +++ b/gpsbabel/skytraq.cc @@ -26,6 +26,8 @@ #include "defs.h" #include "gbser.h" #include +#include +#include #define MYNAME "skytraq" diff --git a/gpsbabel/stmsdf.cc b/gpsbabel/stmsdf.cc index 44c809459..f5f01f03b 100644 --- a/gpsbabel/stmsdf.cc +++ b/gpsbabel/stmsdf.cc @@ -37,6 +37,7 @@ #include "grtcirc.h" #include +#include #include #define MYNAME "stmsdf" diff --git a/gpsbabel/tiger.cc b/gpsbabel/tiger.cc index b81279167..2921d4254 100644 --- a/gpsbabel/tiger.cc +++ b/gpsbabel/tiger.cc @@ -22,6 +22,8 @@ #include "defs.h" #include "csv_util.h" #include +#include +#include static gbfile* file_in, *file_out; static short_handle mkshort_handle; diff --git a/gpsbabel/tomtom.cc b/gpsbabel/tomtom.cc index faf8b8dd5..ce9cc786a 100644 --- a/gpsbabel/tomtom.cc +++ b/gpsbabel/tomtom.cc @@ -39,6 +39,7 @@ #include "defs.h" +#include // sprintf #include // qsort #define MYNAME "TomTom" diff --git a/gpsbabel/tpo.cc b/gpsbabel/tpo.cc index d7cfc765b..c9a293e60 100644 --- a/gpsbabel/tpo.cc +++ b/gpsbabel/tpo.cc @@ -74,6 +74,9 @@ #include "defs.h" #include "jeeps/gpsmath.h" /* for datum conversions */ #include +#include +#include +#include #define MYNAME "TPO" diff --git a/gpsbabel/v900.cc b/gpsbabel/v900.cc index 0e7d860fb..16c4860b2 100644 --- a/gpsbabel/v900.cc +++ b/gpsbabel/v900.cc @@ -72,8 +72,9 @@ for a little more info, see structures: ******************************************************************************/ #include "defs.h" -#include #include +#include +#include // atoi #if _MSC_VER #define __func__ __FUNCTION__ diff --git a/gpsbabel/vcf.cc b/gpsbabel/vcf.cc index 89b166fb8..740e3e891 100644 --- a/gpsbabel/vcf.cc +++ b/gpsbabel/vcf.cc @@ -18,12 +18,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ - -#include -#include - #include "defs.h" #include "jeeps/gpsmath.h" +#include +#include +#include static gbfile* file_out; static short_handle mkshort_handle; diff --git a/gpsbabel/vidaone.cc b/gpsbabel/vidaone.cc index cc66ba61a..a4d42d0f8 100644 --- a/gpsbabel/vidaone.cc +++ b/gpsbabel/vidaone.cc @@ -32,6 +32,7 @@ struct */ #include "defs.h" +#include #include #define MYNAME "vidaone" diff --git a/gpsbabel/wbt-200.cc b/gpsbabel/wbt-200.cc index 060e94196..6a145ce77 100644 --- a/gpsbabel/wbt-200.cc +++ b/gpsbabel/wbt-200.cc @@ -21,6 +21,8 @@ #include "defs.h" #include "gbser.h" #include "grtcirc.h" +#include +#include #define MYNAME "WBT-100/200" #define NL "\x0D\x0A" diff --git a/gpsbabel/wfff_xml.cc b/gpsbabel/wfff_xml.cc index d8a5c106e..dc808b5fb 100644 --- a/gpsbabel/wfff_xml.cc +++ b/gpsbabel/wfff_xml.cc @@ -20,6 +20,7 @@ #include "defs.h" #include "xmlgeneric.h" #include +#include /* argument storage */ static char* aicicon =0; diff --git a/gpsbabel/xcsv.cc b/gpsbabel/xcsv.cc index b47051cc0..365df6584 100644 --- a/gpsbabel/xcsv.cc +++ b/gpsbabel/xcsv.cc @@ -23,10 +23,11 @@ */ -#include #include "defs.h" #include "csv_util.h" #include "jeeps/gpsmath.h" +#include +#include #if CSVFMTS_ENABLED #define MYNAME "XCSV" -- 2.30.2